From 279a6c16e6bdaa96e0c7babb7fc4f81c7270ca64 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Thu, 1 Mar 2007 13:48:31 +0000 Subject: [PATCH] Fix Xend domain_lookup error report when looking up an invalid domain: raise the correct error code (XendInvalidDomain instead of XendError). Also remove redundance exception code that is handled by domain_lookup. Signed-off-by: Yung Giang --- tools/python/xen/xend/XendDomain.py | 4 ++-- tools/python/xen/xend/server/SrvDomainDir.py | 2 -- tools/python/xen/xend/server/XMLRPCServer.py | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index 7852015364..7e5f618870 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/tools/python/xen/xend/XendDomain.py @@ -488,14 +488,14 @@ class XendDomain: @type domid: int or string @return: Found domain. @rtype: XendDomainInfo - @raise XendError: If domain is not found. + @raise XendInvalidDomain: If domain is not found. """ self.domains_lock.acquire() try: self._refresh(refresh_shutdown = False) dom = self.domain_lookup_nr(domid) if not dom: - raise XendError("No domain named '%s'." % str(domid)) + raise XendInvalidDomain("No domain named '%s'." % str(domid)) return dom finally: self.domains_lock.release() diff --git a/tools/python/xen/xend/server/SrvDomainDir.py b/tools/python/xen/xend/server/SrvDomainDir.py index 950b26316d..fdee1b75ca 100644 --- a/tools/python/xen/xend/server/SrvDomainDir.py +++ b/tools/python/xen/xend/server/SrvDomainDir.py @@ -42,8 +42,6 @@ class SrvDomainDir(SrvDir): def domain(self, x): dom = self.xd.domain_lookup(x) - if not dom: - raise XendError('No such domain ' + str(x)) return SrvDomain(dom) def get(self, x): diff --git a/tools/python/xen/xend/server/XMLRPCServer.py b/tools/python/xen/xend/server/XMLRPCServer.py index 09a66549e9..7c3a2a1a9d 100644 --- a/tools/python/xen/xend/server/XMLRPCServer.py +++ b/tools/python/xen/xend/server/XMLRPCServer.py @@ -43,8 +43,6 @@ def fixup_sxpr(sexpr): def lookup(domid): info = XendDomain.instance().domain_lookup(domid) - if not info: - raise XendInvalidDomain(str(domid)) return info def dispatch(domid, fn, args): -- 2.30.2